From aa4a41face7424b59bd6ffd71348f988730da58a Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 18 May 2001 20:56:55 +0000 Subject: [PATCH] Reset style attributes even if the widget isn't realized. Fri May 18 15:26:26 2001 Owen Taylor * gtk/gtktextview.c (gtk_text_view_style_set): Reset style attributes even if the widget isn't realized. * demos/gtk-demo/main.c: Use a slightly smaller font. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ demos/gtk-demo/main.c | 2 +- docs/reference/gtk/tmpl/gtk-unused.sgml | 8 ++++++++ docs/reference/gtk/tmpl/gtkimagemenuitem.sgml | 12 ++---------- gtk/gtktextview.c | 3 +++ 11 files changed, 63 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d3431be51..334b994642 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri May 18 15:26:26 2001 Owen Taylor + + * gtk/gtktextview.c (gtk_text_view_style_set): Reset + style attributes even if the widget isn't realized. + + * demos/gtk-demo/main.c: Use a slightly smaller font. + Fri May 18 14:25:20 2001 Owen Taylor * gtk/gtkcontainer.c: Remove reallocate-redraws property. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 1d3431be51..334b994642 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Fri May 18 15:26:26 2001 Owen Taylor + + * gtk/gtktextview.c (gtk_text_view_style_set): Reset + style attributes even if the widget isn't realized. + + * demos/gtk-demo/main.c: Use a slightly smaller font. + Fri May 18 14:25:20 2001 Owen Taylor * gtk/gtkcontainer.c: Remove reallocate-redraws property. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1d3431be51..334b994642 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Fri May 18 15:26:26 2001 Owen Taylor + + * gtk/gtktextview.c (gtk_text_view_style_set): Reset + style attributes even if the widget isn't realized. + + * demos/gtk-demo/main.c: Use a slightly smaller font. + Fri May 18 14:25:20 2001 Owen Taylor * gtk/gtkcontainer.c: Remove reallocate-redraws property. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 1d3431be51..334b994642 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Fri May 18 15:26:26 2001 Owen Taylor + + * gtk/gtktextview.c (gtk_text_view_style_set): Reset + style attributes even if the widget isn't realized. + + * demos/gtk-demo/main.c: Use a slightly smaller font. + Fri May 18 14:25:20 2001 Owen Taylor * gtk/gtkcontainer.c: Remove reallocate-redraws property. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1d3431be51..334b994642 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Fri May 18 15:26:26 2001 Owen Taylor + + * gtk/gtktextview.c (gtk_text_view_style_set): Reset + style attributes even if the widget isn't realized. + + * demos/gtk-demo/main.c: Use a slightly smaller font. + Fri May 18 14:25:20 2001 Owen Taylor * gtk/gtkcontainer.c: Remove reallocate-redraws property. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1d3431be51..334b994642 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Fri May 18 15:26:26 2001 Owen Taylor + + * gtk/gtktextview.c (gtk_text_view_style_set): Reset + style attributes even if the widget isn't realized. + + * demos/gtk-demo/main.c: Use a slightly smaller font. + Fri May 18 14:25:20 2001 Owen Taylor * gtk/gtkcontainer.c: Remove reallocate-redraws property. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1d3431be51..334b994642 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Fri May 18 15:26:26 2001 Owen Taylor + + * gtk/gtktextview.c (gtk_text_view_style_set): Reset + style attributes even if the widget isn't realized. + + * demos/gtk-demo/main.c: Use a slightly smaller font. + Fri May 18 14:25:20 2001 Owen Taylor * gtk/gtkcontainer.c: Remove reallocate-redraws property. diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index 69710e3ada..d5d0238dde 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -646,7 +646,7 @@ create_text (GtkTextBuffer **buffer, if (is_source) { - font_desc = pango_font_description_from_string ("Courier 14"); + font_desc = pango_font_description_from_string ("Courier 12"); gtk_widget_modify_font (text_view, font_desc); pango_font_description_free (font_desc); diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index b39f073487..f9c405430f 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -1019,6 +1019,14 @@ Get the type of GtkIdentifier. @Returns: GtkType -- the enumerated type of something. + + + + + +@image_menu_item: +@child: + diff --git a/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml b/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml index e8b5829f36..dd6a07fb32 100644 --- a/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkimagemenuitem.sgml @@ -27,15 +27,6 @@ GtkImageMenuItem - - - - - -@image_menu_item: -@child: - - @@ -58,9 +49,10 @@ GtkImageMenuItem +@Returns: + @widget: @label: -@Returns: diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 8bb7314b47..bcbb5b58c1 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -2792,7 +2792,10 @@ gtk_text_view_style_set (GtkWidget *widget, if (text_view->bottom_window) gdk_window_set_background (text_view->bottom_window->bin_window, &widget->style->bg[GTK_WIDGET_STATE (widget)]); + } + if (text_view->layout && previous_style) + { gtk_text_view_set_attributes_from_style (text_view, text_view->layout->default_style, widget->style); -- 2.30.2